From: Glenn Morris Date: Thu, 13 Dec 2012 05:29:15 +0000 (-0800) Subject: Merge from emacs-24; up to 2012-11-30T04:44:52Z!cyd@gnu.org X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~3615^2~1353 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=727f97393714c5c92aef793f0749ebfde1d14f3c;p=emacs.git Merge from emacs-24; up to 2012-11-30T04:44:52Z!cyd@gnu.org --- 727f97393714c5c92aef793f0749ebfde1d14f3c diff --cc ChangeLog index 92c11ad1645,a8108968665..498bc328714 --- a/ChangeLog +++ b/ChangeLog @@@ -1,71 -1,22 +1,80 @@@ + 2012-12-13 Glenn Morris + - * info/dir: Add bovine, wisent. ++ * info/dir: Add bovine, srecode, wisent. + -2012-12-12 Andreas Schwab ++2012-12-13 Andreas Schwab + + * Makefile.in (install-info): Use `${MAKE} -s' for echo-info. - (uninstall): Likewise. ++ (uninstall): Likewise. (Bug#13143) + -2012-12-12 Glenn Morris +2012-12-11 Paul Eggert - * info/dir: Add srecode. + Merge from gnulib for 'inline' (Bug#13040), incorporating: + 2012-12-11 extern-inline: avoid incompatibility with Darwin Libc + * m4/extern-inline.m4: Update from gnulib. -2012-12-11 Nicolas Richard (tiny change) +2012-12-11 Juanma Barranquero - * Makefile.in (install-info, uninstall): Ensure make's messages - about changing directories are in English. (Bug#13143) + * lib/makefile.w32-in (SIG2STR_H): New macro. + ($(BLD)/sig2str.$(O)): Update dependencies. -2012-12-05 Glenn Morris +2012-12-10 Paul Eggert + + * configure.ac (HAVE_INOTIFY): Speed up configure-time test. + There's no need to test for any of three inotify functions, + since we use all three. Check for just the first one. + +2012-12-10 Daniel Colascione + + * .bzrignore: add src/emacs.res. + + * configure.ac (W32_RES, W32_RES_LINK, WINDRES): Teach the cygw32 + build how to compile Windows resource files; use these variables + to tell src/Makefile.in how and whether to compile resources. + +2012-12-10 Rüdiger Sonderfeld + + * configure.ac (inotify): New option. + (HAVE_INOTIFY): Test for inotify. + +2012-12-09 Andreas Schwab + + * configure.ac: Fix source command in .gdbinit. + Don't quote $MAKEINFO. + +2012-12-09 Paul Eggert + + Allow spaces in some configuration vars (Bug#13078). + * configure.ac (srcdir): Don't assume $PWD lacks spaces. + (srcdir, MAKEINFO, PKG_CONFIG, PKG_CONFIG_MIN_VERSION): + All uses quoted, to allow spaces in these vars. + +2012-12-08 Paul Eggert + + Use putenv+unsetenv instead of modifying environ directly (Bug#13070). + * lib/putenv.c, lib/unsetenv.c, m4/putenv.m4, m4/setenv.m4: + New files, copied automatically from gnulib. + * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate. + +2012-12-08 Eli Zaretskii + + * lib/makefile.w32-in ($(BLD)/sig2str.$(O)): New dependency. + Remove a stray character at the beginning of the file. + (Bug#13026) + +2012-12-08 Paul Eggert + + Simplify get_lim_data. + * configure.ac (ULIMIT_BREAK_VALUE): Remove. + + Assume POSIX 1003.1-1988 or later for signal.h (Bug#13026). + * configure.ac (PTY_OPEN, PTY_TTY_NAME_SPRINTF): + Use SIGCHLD rather than SIGCLD. + * lib/sig2str.c, lib/sig2str.h, m4/sig2str.m4: New files, from gnulib. + * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate. + * lib/makefile.w32-in (GNULIBOBJS): Add $(BUILD)/sig2str.$(O). + +2012-12-06 Glenn Morris * configure.ac: Handle info/ files with or without ".info" extension. diff --cc doc/misc/ChangeLog index 9de75390937,d0530d312f7..225f9c6964d --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@@ -1,14 -1,63 +1,72 @@@ + 2012-12-13 Glenn Morris + + * wisent.texi: Small edits. Set copyright to FSF, update license to + GFDL 1.3+. + * Makefile.in (INFO_TARGETS, DVI_TARGETS, PDF_TARGETS): Add wisent. + (wisent, $(buildinfodir)/wisent$(INFO_EXT), wisent.dvi, wisent.pdf): + New targets. + * makefile.w32-in (INFO_TARGETS, DVI_TARGETS, clean): Add wisent. + ($(infodir)/wisent$(INFO_EXT), wisent.dvi): New targets. + + * bovine.texi: Small edits. Set copyright to FSF, update license to + GFDL 1.3+, remove empty index. + * Makefile.in (INFO_TARGETS, DVI_TARGETS, PDF_TARGETS): Add bovine. + (bovine, $(buildinfodir)/bovine$(INFO_EXT), bovine.dvi, bovine.pdf): + New targets. + * makefile.w32-in (INFO_TARGETS, DVI_TARGETS, clean): Add bovine. + ($(infodir)/bovine$(INFO_EXT), bovine.dvi): New targets. + + 2012-12-13 Eric Ludlam + David Ponce + Richard Kim + + * bovine.texi, wisent.texi: New files, imported from CEDET trunk. + -2012-12-12 Glenn Morris ++2012-12-13 Glenn Morris + + * flymake.texi (Customizable variables, Locating the buildfile): + Remove refs to flymake-buildfile-dirs, removed 2007-07-20. (Bug#13148) + + * srecode.texi: Small edits. Set copyright to FSF, add explicit + GFDL 1.3+ license, fix up index. + * Makefile.in (INFO_TARGETS, DVI_TARGETS, PDF_TARGETS): Add srecode. + (srecode, $(buildinfodir)/srecode$(INFO_EXT), srecode.dvi) + (srecode.pdf): New targets. + * makefile.w32-in (INFO_TARGETS, DVI_TARGETS, clean): Add srecode. + ($(infodir)/srecode$(INFO_EXT), srecode.dvi): New targets. + -2012-12-12 Eric Ludlam ++2012-12-13 Eric Ludlam + + * srecode.texi: New file, imported from CEDET trunk. + -2012-12-12 Bastien Guerry ++2012-12-13 Bastien Guerry + + * org.texi (Summary, Code block specific header arguments) + (Code block specific header arguments) + (Header arguments in function calls, var, noweb) - (Results of evaluation, Code evaluation security): Small - reformatting: add a blank line before some example. ++ (Results of evaluation, Code evaluation security): ++ Small reformatting: add a blank line before some example. + + * org.texi (System-wide header arguments) + (Header arguments in Org mode properties, Conflicts) - (Dynamic blocks, Using the mapping API): Fix indendation of - Elisp code examples. ++ (Dynamic blocks, Using the mapping API): ++ Fix indentation of Elisp code examples. + + * org.texi (Comment lines): Fix description of the comment syntax. + - * org.texi (Installation): Mention "make test" in the correct - section. ++ * org.texi (Installation): Mention "make test" in the correct section. ++ +2012-12-06 Paul Eggert + + * doclicense.texi, gpl.texi: Update to latest version from FSF. + These are just minor editorial changes. -2012-12-02 Michael Albinus +2012-12-04 Michael Albinus + + * tramp.texi (History): Mention ADB. + (Inline methods): Add `adb' method. + +2012-12-03 Michael Albinus * tramp.texi (Top, Obtaining Tramp): Replace CVS by Git. (External methods): Fix typo. diff --cc lisp/ChangeLog index 97b44b22975,fb75b3678c7..3390a2e8e7c --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,98 -1,20 +1,109 @@@ -2012-12-11 Alan Mackenzie ++2012-12-13 Alan Mackenzie + + Make CC Mode not hang when _some_ lines end in CRLF. Bug #11841. + * progmodes/cc-engine.el (c-backward-comments): Add code to work + around `forward-comment' not recognizing ^M as whitespace. + -2012-12-11 Fabián Ezequiel Gallina ++2012-12-13 Fabián Ezequiel Gallina + + * progmodes/python.el (python-skeleton-class) + (python-skeleton-def): Do not add space after defun name. + -2012-12-09 Chong Yidong +2012-12-13 Stefan Monnier + + * emacs-lisp/cl.el (letf): Make it an alias of cl-letf. + (cl--symbol-function): Remove (now that funbound is like nil). + +2012-12-12 Glenn Morris + + * button.el (button--area-button-p): Fix typo. + +2012-12-12 Sam Steingold + + * frame.el (frame-maximization-style): New user option. + (toggle-frame-maximized): Toggle frame maximization according to + `frame-maximization-style', bound to . + (cycle-frame-maximized): Cycle between all maximization styles and + non-maximized frame, bound to shift-. + +2012-12-12 David Cadé + + * mpc.el (mpc-format): Use truncate-string-to-width (bug#13143). + +2012-12-12 Jonas Bernoulli + + * lisp/emacs-lisp/eieio.el: Prettier object pretty-printing (bug#13115). + (eieio-override-prin1): Don't quote kewords and booleans. + (object-write) : Don't put closing parens + on new line, avoid needless empty lines, align values that are objects + with the slot keyword (instead of beginning on the same line). + (eieio-list-prin1): Align value with slot keyword; increase + eieio-print-depth before printing members of the list. + +2012-12-11 Stefan Monnier + + * mail/emacsbug.el (report-emacs-bug): Move the intangible text to + a display text-property. + (report-emacs-bug-hook): Don't bother deleting it any more. + + * hilit-chg.el (highlight-save-buffer-state): Delete. + Use with-silent-modifications instead. + (hilit-chg-set-face-on-change): Only fixup the text that's modified. + + * button.el: Handle buttons in display text-properties. + (button--area-button-p, button--area-button-string): + Use (STRING . STRING-POS) representation instead of just STRING. + +2012-12-11 Eli Zaretskii + + * makefile.w32-in (compile4-SH): Fix a typo that caused term + subdirectory be skipped. + +2012-12-11 Glenn Morris + + * net/rcirc.el (rcirc-urls, rcirc-condition-filter): Doc fixes. + + * progmodes/f90.el (f90-line-continued, f90-indent-region): + Treat preprocessor lines embedded in continuations like comments. + (f90-indent-line): Special-case preprocessor lines. (Bug#13138) + +2012-12-11 Jay Belanger - * simple.el (set-mark-default-inactive): Mark as obsolete, for - removal after 24.3. + * calc/calc.el (calc-standard-date-formats): Add more date + formats. + * calc/calc-forms.el (math-parse-iso-date): New function. + (math-parse-date): Use `math-parse-iso-date' when appropriate. + (math-parse-iso-date-validate): Add extra error checking. + (calc-date-notation): Add ability to access new date formats. -2012-12-08 Dani Moncayo +2012-12-10 Stefan Monnier + + * hi-lock.el (hi-lock--regexps-at-point): Fix boundary case for + font-lock as well as when there's no text-property. + +2012-12-10 Jambunathan K + + * hi-lock.el: Refine the choice of default face. + (hi-lock-keyword->face): New function. Use it wherever we used + cadadadr instead. + (hi-lock--regexps-at-point): Ignore faces that can't come from hi-lock. + (hi-lock--last-face): Remove var. + (hi-lock--unused-faces): New var to replace it. + (hi-lock-read-face-name): Use/maintain it. + (hi-lock-unface-buffer): Maintain it. Fix error for the C-u case. + (hi-lock-set-pattern): Ignore new rule if it has the same regexp even + if it has another face. + +2012-12-10 Eli Zaretskii + + * subr.el (w32notify-handle-event): New function. + (inotify-handle-event): Doc fix. + +2012-12-10 Rüdiger Sonderfeld + + * subr.el (inotify-event-p, inotify-handle-event): New functions. + +2012-12-10 Dani Moncayo * simple.el (just-one-space): Doc fix. diff --cc lisp/org/ChangeLog index 98383e56532,c146488991b..f7715198464 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@@ -1,8 -1,90 +1,94 @@@ -2012-12-12 Bastien Guerry ++2012-12-13 Bastien Guerry + + * org-latex.el (org-export-latex-links): Escape raw path when + exporting links to files. + + * org-src.el (org-src-native-tab-command-maybe): Fix bug: the + S-TAB key should not trigger a native TAB command. + + * org.el (org-open-at-point): Allow to open any link within + footnotes definition, not only bracket links. + + * org.el (org-sort-entries): Bugfix: keep track of the clock + marker when sorting entries. Enhance the docstring. + + * org-clock.el (org-clock-out): Use `user-error' when the user + tries to clock out while there is no running clock. + + * org-table.el (org-table-sort-lines): Ensure coordinates are + correctly displayed when sorting. + + * org.el (org-do-sort): Enhance prompt. + + * org-agenda.el (org-agenda-finalize): Also activate plain links. + + * org-timer.el (org-timer-stop): Add message. + - * org-agenda.el (org-agenda-schedule, org-agenda-deadline): Fix - redundant messages. ++ * org-agenda.el (org-agenda-schedule, org-agenda-deadline): ++ Fix redundant messages. + + * org-agenda.el (org-agenda-finalize): Fix clock highlighting. + + * org.el (org-additional-option-like-keywords): Add "INDEX:". + + * org-install.el: Enhance warning. + -2012-12-12 Erik Hetzner (tiny change) ++2012-12-13 Erik Hetzner (tiny change) + + * org.el (org-log-into-drawer): Honor the nil value for the + :LOG_INTO_DRAWER: property. + -2012-12-12 Le Wang (tiny change) ++2012-12-13 Le Wang (tiny change) + + * org-src.el (org-edit-src-exit): Fix editing source section with + blank lines. + -2012-12-12 Le Wang ++2012-12-13 Le Wang + + * org-src.el (org-edit-src-code): Use marker with insertion type + t to track end and remove hack requiring delete from beg to (1- end). + -2012-12-12 Nicolas Goaziou ++2012-12-13 Nicolas Goaziou + + * org-element.el (org-element-context): When point is between two + objects, be sure to return the second one. + + * org-list.el (org-list-separating-blank-lines-number): When + computing number of blank lines separating items, also count those + in unparsed blocks, like example blocks. + + * org.el (org-end-of-line): When visual line mode is on, really + move by visual lines. Small refactoring. + + * org.el (org-end-of-line): On a hidden block make sure to + delegate motion to `end-of-line' instead of `move-end-of-line' in + order to stay on the current line. + -2012-12-12 Rafael Laboissiere (tiny change) ++2012-12-13 Rafael Laboissiere (tiny change) + + * org-bibtex.el: In the documentation section of the file, fix the + broken URL to Andrew Roberts' document on BibTeX entries. + + * org-remember.el (org-remember-handler): Correctly strip the + comment lines in the temporary buffer *Remember* when handling a + remember note. + + * org-remember.el (org-remember-apply-template): Start the + commented lines in the Remember temporary buffer with the + appropriate characters. + -2012-12-12 Toby S. Cubitt ++2012-12-13 Toby S. Cubitt + + * org.el (org-beginning-of-line): Check `visual-line-mode' instead - of `line-visual-mode' to determine whether to move by visual - lines. ++ of `line-visual-mode' to determine whether to move by visual lines. + + * org.el (org-kill-line): Use the `org-bound-and-true-p' macro. + +2012-12-04 Chong Yidong + + * org-bibtex.el (org-bibtex-ask): Use visual-line-mode instead of + longlines-mode. + 2012-10-26 Achim Gratz * ob-ditaa.el: Needs to (require 'org-compat) for diff --cc src/ChangeLog index 53c0d93f512,5239559f867..b7bb772d266 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,205 -1,16 +1,217 @@@ -2012-12-11 Eli Zaretskii ++2012-12-13 Eli Zaretskii + + * search.c (search_buffer): Check the inverse translations of each + character in pattern when the buffer being searched is unibyte. + (Bug#13084) + -2012-12-10 Paul Eggert ++2012-12-13 Paul Eggert + + * fileio.c (Fvisited_file_modtime): Return (-1 ...) for nonexistent + files, fixing a regression from 24.2. + (Fverify_visited_file_modtime): Don't read uninitialized st.st_size. + -2012-12-08 Jan Djärv +2012-12-13 Paul Eggert + + * fileio.c (Fcopy_file): Make fstat failure as serious as open failure. + fstat shouldn't fail, and if it does fail copy-file should not proceed. + Remove unnecessary S_ISLNK test, as (contra the comments) this + function can't copy symlinks. Improve quality of error message + when attempting to copy files that are neither regular files nor + directories. + +2012-12-12 Dmitry Antipov + + * dispnew.c (set_window_cursor_after_update): Use clip_to_bounds. + * gtkutil.c (xg_set_toolkit_scroll_bar_thumb): + * window.c (Frecenter): + * xdisp.c (resize_mini_window, hscroll_window_tree, draw_glyphs): + * xterm.c (x_set_toolkit_scroll_bar_thumb): Likewise. + +2012-12-12 Daniel Colascione + + * unexcw.c (fixup_executable): use posix_fallocate to ensure that + the dumped Emacs is not a sparse file, greatly improving Cygwin + "make bootstrap" performance. + +2012-12-11 Michael Albinus + + * inotify.c (inotify_callback): Generate an Emacs event for every + incoming inotify event. + +2012-12-11 Eli Zaretskii + + * xdisp.c (handle_face_prop): Fix logic of computing + it->start_of_box_run_p. + (append_space_for_newline): If the glyph row is R2L, reset the + iterator's end_of_box_run_p flag before prepending the space glyph. + (extend_face_to_end_of_line): If the glyph row is R2L, reset the + iterator's start_of_box_run_p flag before prepending the stretch. + (append_glyph, produce_image_glyph, append_composite_glyph) + (append_stretch_glyph, append_glyphless_glyph): Reverse the + left_box_line_p and right_box_line_p flags of the glyph for R2L + glyph rows. (Bug#13011) + +2012-12-11 Dmitry Antipov + + * buffer.c (Fset_buffer_multibyte): Do not force redisplay + if changed buffer is not shown in a window. + * insdel.c (prepare_to_modify_buffer): Likewise. + * window.c (replace_buffer_in_windows_safely): Do nothing + if buffer is not shown in a window. + (Fforce_window_update): Likewise if string or buffer argument + is passed. + +2012-12-11 Eli Zaretskii + + * inotify.c (Finotify_add_watch): Rename decoded_file_name to + encoded_file_name, which is what it is. + +2012-12-11 Dmitry Antipov + + Consistently use marker_position and marker_byte_position. + * fringe.c (Ffringe_bitmaps_at_pos): + * indent.c (Fvertical_motion): + * insdel.c (prepare_to_modify_buffer): + * keyboard.c (make_lispy_position): + * window.c (Fwindow_end, Fpos_visible_in_window_p, unshow_buffer) + (window_scroll_pixel_based, displayed_window_lines) + (Fset_window_configuration): + * xdisp.c (message_dolog, with_echo_area_buffer_unwind_data) + (mark_window_display_accurate_1, redisplay_window, decode_mode_spec): + Replace direct access to marker fields with calls + to marker_position and/or marker_byte_position. + +2012-12-11 Juanma Barranquero + + * makefile.w32-in (SIG2STR_H): New macro. + (SYSWAIT_H, $(BLD)/emacs.$(O), $(BLD)/process.$(O)) + ($(BLD)/w32notify.$(O)): Update dependencies. + +2012-12-10 Daniel Colascione + + * w32term.c, keyboard.c: Fix build break in cygw32 by omitting + Windows file notification functionality unless WINDOWSNT. + + * w32gui.h (hprevinst, lpCmdLine, nCmdShow): Remove unused + declarations. + + * w32fns.c (cache_system_info): Initialize the global hinst + variable here so various initialization calls DTRT. + + * unexw32.c (hprevinst, lpCmdLine, nCmdShow): Remove unused + variables. + (hinst): Remove unneeded extern declaration. + (_start): Remove initialization of above variables; remove + initialization of hinst, as cache_system_info now does that. + + * emacs.c (main): Call cache_system_info early in startup; we + previously weren't calling it in Cygwin builds. + + * Makefile.in (ntsource, WINDRES, W32_RES, W#@_RES_LINK): Teach + the autoconf build system how to compile a Windows resource file + and link it to Emacs. + +2012-12-10 Dmitry Antipov + + Per-buffer window counters. + * buffer.h (struct buffer): New member window_count. + (buffer_window_count): New function. + * buffer.c (Fget_buffer_create, Fmake_indirect_buffer): + Initialize window_count. + (Fkill_buffer): Verify window_count for the buffer being killed. + (modify_overlay): Do not force redisplay if buffer is not shown + in any window. + (init_buffer_once): Initialize window_count for buffer_defaults + and buffer_local_symbols. + * window.h (buffer_shared): Remove declaration. + (wset_buffer): Convert from inline ... + * window.c (wset_buffer): ... to an ordinary function. + (adjust_window_count): New function. + (make_parent_window): Use it. + * xdisp.c (buffer_shared): Remove. + (redisplay_internal, redisplay_window): Adjust users. + (buffer_shared_and_changed): Use per-buffer window counter. + +2012-12-10 Eli Zaretskii + + Support for filesystem notifications on MS-Windows. + * w32proc.c (sys_select): If drain_message_queue returns non-zero, + and this is a TTY frame, signal the caller that keyboard input is + available. + + * w32xfns.c (drain_message_queue): Now returns an int: an + indication whether any WM_EMACS_FILENOTIFY messages were found in + the queue. + + * w32inevt.c (handle_file_notifications): New function. + (w32_console_read_socket): Call it to process file notifications. + + * w32console.c (initialize_w32_display): Record the main thread ID + in dwMainThreadId. + + * deps.mk (inotify.o): New dependency list. + + * Makefile.in (SOME_MACHINE_OBJECTS): Add w32notify.o. + + * w32term.h (WM_EMACS_FILENOTIFY): New custom message. + (WM_EMACS_END): Bump value by 1. + (notification_buffer_in_use, file_notifications) + (notifications_size, notifications_desc): Declare. + (w32_get_watch_object, lispy_file_action, globals_of_w32notify): + Add prototypes. + + * w32term.c (lispy_file_action, queue_notifications): New functions. + (syms_of_w32term) + : New symbols. + (w32_read_socket): Handle the WM_EMACS_FILENOTIFY message. + + * w32notify.c: New file, implements file event notifications for + MS-Windows. + + * w32fns.c (w32_wnd_proc): Handle the WM_EMACS_FILENOTIFY message + by posting it to the w32_read_socket queue. + + * termhooks.h (enum event_kind) [HAVE_NTGUI]: Support + FILE_NOTIFY_EVENT. + + * makefile.w32-in (OBJ2): Add $(BLD)/w32notify.$(O). + (GLOBAL_SOURCES): Add w32notify.c + ($(BLD)/w32notify.$(O)): New set of dependencies. + + * lisp.h (syms_of_w32notify) [WINDOWSNT]: Add prototype. + + * keyboard.c (kbd_buffer_get_event) [WINDOWSNT]: Handle + FILE_NOTIFY_EVENT. + (syms_of_keyboard) [HAVE_NTGUI] : New symbol. + (keys_of_keyboard) [WINDOWSNT]: Bind file-notify to + w32notify-handle-event by default. + + * emacs.c (main) [WINDOWSNT]: Call globals_of_w32notify and + syms_of_w32notify. + +2012-12-10 Rüdiger Sonderfeld + + Support for filesystem notifications on GNU/Linux via inotify. + * termhooks.h (enum event_kind) [HAVE_INOTIFY]: Add + FILE_NOTIFY_EVENT. + + * lisp.h (syms_of_inotify) [HAVE_INOTIFY]: Add prototype. + + * keyboard.c (Qfile_inotify) [HAVE_INOTIFY]: New variable. + (syms_of_keyboard): DEFSYM it. + (kbd_buffer_get_event) [HAVE_INOTIFY]: Generate FILE_NOTIFY_EVENT. + (make_lispy_event): Support FILE_NOTIFY_EVENT by generating + Qfile_inotify events. + (keys_of_keyboard) [HAVE_INOTIFY]: Bind file-inotify events in + special-event-map to inotify-handle-event. + + * emacs.c (main) [HAVE_INOTIFY]: Call syms_of_inotify. + + * Makefile.in (base_obj): Add inotify.o. + + * inotify.c: New file. + +2012-12-10 Jan Djärv * nsterm.m (fd_handler:): FD_ZERO fds (Bug#13103). diff --cc src/fileio.c index d9029d29168,7e1ba71c822..874162c5bb6 --- a/src/fileio.c +++ b/src/fileio.c @@@ -5125,9 -5143,15 +5125,9 @@@ See Info node `(elisp)Modification Time mtime = (stat (SSDATA (filename), &st) == 0 ? get_stat_mtime (&st) : time_error_value (errno)); - if ((EMACS_TIME_EQ (mtime, b->modtime) - /* If both exist, accept them if they are off by one second. */ - || (EMACS_TIME_VALID_P (mtime) && EMACS_TIME_VALID_P (b->modtime) - && ((diff = (EMACS_TIME_LT (mtime, b->modtime) - ? sub_emacs_time (b->modtime, mtime) - : sub_emacs_time (mtime, b->modtime))), - EMACS_TIME_LE (diff, make_emacs_time (1, 0))))) + if (EMACS_TIME_EQ (mtime, b->modtime) - && (st.st_size == b->modtime_size - || b->modtime_size < 0)) + && (b->modtime_size < 0 + || st.st_size == b->modtime_size)) return Qt; return Qnil; }